Don't include gtkprinter-private.h here.

2006-06-08  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkprintbackend.h: Don't include gtkprinter-private.h here.

	* gtk/gtkprintunixdialog.c:
	* gtk/gtkprintoperation-unix.c:
	* gtk/gtkprintjob.c:
	* gtk/gtkprintbackend.c: Instead include it here.

	* gtk/gtk.symbols:
	* gtk/gtkprintoperation.h:
	* gtk/gtkprintoperation.c: Rename pdf_target to export_filename.

diff --git a/ChangeLog b/ChangeLog
index 032187d02428d6c2778bc1653e535569873097a9..8189bd3a5d9f8917b79182f4e21563a2a3edd7e4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2006-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprintbackend.h: Don't include gtkprinter-private.h here.
+
+       * gtk/gtkprintunixdialog.c: 
+       * gtk/gtkprintoperation-unix.c: 
+       * gtk/gtkprintjob.c: 
+       * gtk/gtkprintbackend.c: Instead include it here.
+
        * gtk/gtk.symbols: 
        * gtk/gtkprintoperation.h: 
        * gtk/gtkprintoperation.c: Rename pdf_target to export_filename.

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 032187d02428d6c2778bc1653e535569873097a9..8189bd3a5d9f8917b79182f4e21563a2a3edd7e4 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,12 @@
 2006-06-08  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkprintbackend.h: Don't include gtkprinter-private.h here.
+
+       * gtk/gtkprintunixdialog.c: 
+       * gtk/gtkprintoperation-unix.c: 
+       * gtk/gtkprintjob.c: 
+       * gtk/gtkprintbackend.c: Instead include it here.
+
        * gtk/gtk.symbols: 
        * gtk/gtkprintoperation.h: 
        * gtk/gtkprintoperation.c: Rename pdf_target to export_filename.

diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 1a139deb52d998b1a001ed7e4a9aa9d1a8d1e89d..aa6c38cad5458f3e0f1a501cf75004485903a75f 100644 (file)
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -27,6 +27,7 @@
 #include "gtkmodules.h"
 #include "gtkprivate.h"
 #include "gtkprintbackend.h"
+#include "gtkprinter-private.h"
 #include "gtkalias.h"
 
 #define GTK_PRINT_BACKEND_GET_PRIVATE(o)  \

diff --git a/gtk/gtkprintbackend.h b/gtk/gtkprintbackend.h
index e8d9711ea807b4d7badd579b3604d3345a08a4ce..21419095f789008d0dbb7e0b340d9fe5a6f48034 100644 (file)
--- a/gtk/gtkprintbackend.h
+++ b/gtk/gtkprintbackend.h
@@ -32,9 +32,8 @@
 #include <glib-object.h>
 #include <cairo.h>
 
-#include "gtkprinter-private.h"
 #include "gtkprintsettings.h"
-#include "gtkprinteroption.h"
+#include "gtkprinteroptionset.h"
 #include "gtkprintjob.h"
 
 G_BEGIN_DECLS

diff --git a/gtk/gtkprintjob.c b/gtk/gtkprintjob.c
index adc385e14857a104a2a21e539835639c700cf964..2781c996caf73e4e91eaa93b7298d57681dfaec4 100644 (file)
--- a/gtk/gtkprintjob.c
+++ b/gtk/gtkprintjob.c
@@ -35,6 +35,7 @@
 
 #include "gtkprintjob.h"
 #include "gtkprinter.h"
+#include "gtkprinter-private.h"
 #include "gtkprintbackend.h"
 #include "gtkalias.h"
 

diff --git a/gtk/gtkprintoperation-unix.c b/gtk/gtkprintoperation-unix.c
index e73964076aac6e2932dd96dbd64a40584438473e..4eb81c097bebbf652b79f0372e7cd6fa293e7734 100644 (file)
--- a/gtk/gtkprintoperation-unix.c
+++ b/gtk/gtkprintoperation-unix.c
@@ -39,6 +39,7 @@
 #include "gtkpagesetupunixdialog.h"
 #include "gtkprintbackend.h"
 #include "gtkprinter.h"
+#include "gtkprinter-private.h"
 #include "gtkprintjob.h"
 #include "gtklabel.h"
 #include "gtkalias.h"

diff --git a/gtk/gtkprintoperation.c b/gtk/gtkprintoperation.c
index ebf377e4545144f8772b065ce48e1e0650ae2d9f..c54dedd5cea90aa1450c77633c47c6d1b852591c 100644 (file)
--- a/gtk/gtkprintoperation.c
+++ b/gtk/gtkprintoperation.c
@@ -2268,22 +2268,24 @@ print_pages (GtkPrintOperation       *op,
 /**
  * gtk_print_operation_get_error:
  * @op: a #GtkPrintOperation
+ * @error: return location for the error
  * 
  * Call this when the result of a print operation is
  * %GTK_PRINT_OPERATION_RESULT_ERROR, either as returned by 
  * gtk_print_operation_run(), or in the ::done signal handler. 
  * The returned #GError will contain more details on what went wrong.
  *
- * Return value: a #GError representing the error, or #NULL
- *
  * Since: 2.10
  **/
-GError *
-gtk_print_operation_get_error (GtkPrintOperation *op)
+void
+gtk_print_operation_get_error (GtkPrintOperation  *op,
+                              GError            **error)
 {
-  g_return_val_if_fail (GTK_IS_PRINT_OPERATION (op), NULL);
+  g_return_if_fail (GTK_IS_PRINT_OPERATION (op));
   
-  return op->priv->error;
+  g_propagate_error (error, op->priv->error);
+
+  op->priv->error = NULL;
 }
 
 

diff --git a/gtk/gtkprintoperation.h b/gtk/gtkprintoperation.h
index 6f7a4d17a81ab1747543264dd50a3a0115c013cb..abbb1525d0936a07863ac8399cbcaff0521c846c 100644 (file)
--- a/gtk/gtkprintoperation.h
+++ b/gtk/gtkprintoperation.h
@@ -162,7 +162,8 @@ GtkPrintOperationResult gtk_print_operation_run                    (GtkPrintOper
                                                                    GtkPrintOperationAction action,
                                                                    GtkWindow          *parent,
                                                                    GError            **error);
-GError *                gtk_print_operation_get_error              (GtkPrintOperation  *op);
+void                    gtk_print_operation_get_error              (GtkPrintOperation  *op,
+                                                                   GError            **error);
 GtkPrintStatus          gtk_print_operation_get_status             (GtkPrintOperation  *op);
 G_CONST_RETURN gchar *  gtk_print_operation_get_status_string      (GtkPrintOperation  *op);
 gboolean                gtk_print_operation_is_finished            (GtkPrintOperation  *op);

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index c6ebc21134c39809c5187e9025a2720a1b89a0e5..3f2e521050e99b91c597e2e5364f945ad6728302 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -47,6 +47,7 @@
 #include "gtklabel.h"
 
 #include "gtkprintbackend.h"
+#include "gtkprinter-private.h"
 #include "gtkprintunixdialog.h"
 #include "gtkprinteroptionwidget.h"
 #include "gtkalias.h"